merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 30 Dec 2011 08:51:48 +0000 (17:51 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 30 Dec 2011 08:51:48 +0000 (17:51 +0900)
commit4620c4afb36508b841f9bc51e73533a050329b68
tree22444a051f78a0dbd8cde0126d3a35db48f6a520
parent58a52d56b900919dcdca50c3dd9a8efc1c3f5c95
parent3999082ae75f1ca6feceab13b37ee16f2c065b2a
merge trunk